From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 9 Apr 2004 16:41:36 +0000 (+0000)
Subject: (easy-menu-add): Make it work in non-X Emacs.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~23309
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=df014ac0b9e894e2c9ddbd7e04aa80bc68b6a85e;p=emacs.git

(easy-menu-add): Make it work in non-X Emacs.
---

diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 5a2a33575e7..88f7657b6bf 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -1,6 +1,6 @@
 ;;; easymenu.el --- support the easymenu interface for defining a menu
 
-;; Copyright (C) 1994, 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1994,96,98,1999,2000,2004  Free Software Foundation, Inc.
 
 ;; Keywords: emulations
 ;; Author: Richard Stallman <rms@gnu.org>
@@ -478,7 +478,9 @@ Do it only if `easy-menu-precalculate-equivalent-keybindings' is on."
   (when easy-menu-precalculate-equivalent-keybindings
     (if (and (symbolp menu) (not (keymapp menu)) (boundp menu))
 	(setq menu (symbol-value menu)))
-    (if (keymapp menu) (x-popup-menu nil menu))))
+    ;; x-popup-menu does not exist on tty-only Emacs.
+    ;; (if (keymapp menu) (x-popup-menu nil menu))
+    ))
 
 (defun add-submenu (menu-path submenu &optional before in-menu)
   "Add submenu SUBMENU in the menu at MENU-PATH.